Fix duplicated id detection in gtkbuilder

Fix memory handling of duplicated id hashtable and add unit test

diff --git a/gtk/gtkbuilderparser.c b/gtk/gtkbuilderparser.c
index f6f12a5bf6c0d9aca98f212dfa272c5c00eee385..fa8942134d777a1a0bbeb36f500f7dcdbb73bd1a 100644 (file)
--- a/gtk/gtkbuilderparser.c
+++ b/gtk/gtkbuilderparser.c
@@ -404,7 +404,8 @@ parse_object (GMarkupParseContext  *context,
       return;
     }
 
-  g_hash_table_insert (data->object_ids, object_id, GINT_TO_POINTER (line));
+
+  g_hash_table_insert (data->object_ids, g_strdup (object_id), GINT_TO_POINTER (line));
 }
 
 static void
@@ -1128,7 +1129,8 @@ _gtk_builder_parser_parse_buffer (GtkBuilder   *builder,
   data->builder = builder;
   data->filename = filename;
   data->domain = g_strdup (domain);
-  data->object_ids = g_hash_table_new (g_str_hash, g_str_equal);
+  data->object_ids = g_hash_table_new_full (g_str_hash, g_str_equal,
+                                           (GDestroyNotify)g_free, NULL);
 
   data->requested_objects = NULL;
   if (requested_objs)

diff --git a/gtk/tests/builder.c b/gtk/tests/builder.c
index f5a85ac4fa03f2291ccbc8dec62f33bc48a3a06d..2a653b5d79e86863b0e77a813dc6e17cb91e24c7 100644 (file)
--- a/gtk/tests/builder.c
+++ b/gtk/tests/builder.c
@@ -116,6 +116,13 @@ test_parser (void)
                              GTK_BUILDER_ERROR_INVALID_VALUE));
   g_error_free (error);
 
+  error = NULL;
+  gtk_builder_add_from_string (builder, "<interface><object class=\"GtkButton\" id=\"a\"></object><object class=\"GtkButton\" id=\"a\"/></object></interface>", -1, &error);
+  g_assert (g_error_matches (error,
+                             GTK_BUILDER_ERROR,
+                             GTK_BUILDER_ERROR_DUPLICATE_ID));
+  g_error_free (error);
+
   g_object_unref (builder);
 }
 
@@ -2172,7 +2179,7 @@ test_add_objects (void)
     "  </object>"
     "  <object class=\"GtkWindow\" id=\"window2\">"
     "    <child>"
-    "      <object class=\"GtkLabel\" id=\"label1\">"
+    "      <object class=\"GtkLabel\" id=\"label3\">"
     "        <property name=\"label\" translatable=\"no\">second label</property>"
     "      </object>"
     "    </child>"